Repository navigation
[AUTO-CHERRYPICK] python-virtualenv: reconcile CA cleanup and test bootstrap for 3.0-dev - #19725
Merged
Merged
Conversation
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
…thon-virtualenv.spec
Author
|
All conflicts resolved. |
Author
Auto Cherry-Pick SPEC Validation Summary
|
| Source (fasttrack) | Target (3.0-dev) | Resolved | |
|---|---|---|---|
| Version | 20.36.1 | 20.36.1 | 20.36.1 |
| Release | 8 | 8 | 9 |
| Patches | 17 | 16 | 17 |
| Conflict | Yes |
- Unresolved conflict markers (<<<<<<< / >>>>>>>) found in file
- Duplicate changelog entry for 20.36.1-6 (appears 2 times)
3 of 7 tasks
Preserve the published CA patch, wheel helper invocation, and private pinned pytest environment. Remove committed conflict markers, duplicate test flows and duplicate changelog entries. Resequence the dev RPM-owned-packaging fix as release 9. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 5ed20da6-df62-47ec-8bba-6847e07d8f43
jslobodzian
approved these changes
Oct 30, 2026
Retain the existing tox-based ptest bootstrap with packaging==23.2 alongside the published Fast-Track CA cleanup. The build/test payload is identical to successful AMD64 and ARM64 buddy build 1241435; update the unpublished release9 reconciliation entry while preserving the published release8 history and all security patches. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 5ed20da6-df62-47ec-8bba-6847e07d8f43
jslobodzian
approved these changes
Oct 31, 2026
jslobodzian
added a commit
that referenced
this pull request
Oct 31, 2026
Preserve the published release9 security patch set and dependency ordering. Retain the tox-based package-test bootstrap now merged through #19725, resequencing its reconciliation entry above published history as release10. Net changes against current dev are only the 14 published backports and the corresponding SPEC/changelog updates. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 5ed20da6-df62-47ec-8bba-6847e07d8f43
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Cherry-pick the published Fast-Track CA cleanup into
3.0-dev, reconciled with the branch's existing package-test bootstrap.Original Fast-Track PR: #19710
Published source commit:
78a1a1873c10791d520bf6c078abd0f092a9725dChanges
3.0-devtox-based test bootstrap, pinningpackaging==23.2when installing test tooling so pip does not replace the RPM-owned package.20.36.1-8packages as20.36.1-9. Preserve the published Fast-Track changelog entry and record the dev test-bootstrap reconciliation above it.All published CA and embedded-wheel security patches, source signatures, and build/install logic are preserved. This PR targets
3.0-dev; it does not change the published Fast-Track package.Build and tests
Unified buddy build 1241435 succeeded with package tests and install tests enabled on both AMD64 and ARM64.
The buddy build tested the identical build/test payload in #19853 at
af92b2591d5e9cf25db9bc5a8308b2f5f1671f7e. This PR additionally updates the unpublished reconciliation changelog to describe the combined package accurately.